Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typos (backport #2297) #2313

Open
wants to merge 1 commit into
base: release/2.1
Choose a base branch
from
Open

Fix typos (backport #2297) #2313

wants to merge 1 commit into from
+16 −1

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

discovered in #2296

This is an automatic backport of pull request #2297 done by Mergify.

@chipshort @mergify
Fix typos
bad4772 
(cherry picked from commit af9d6cb)

# Conflicts:
#	packages/vm/src/modules/file_system_cache.rs
@mergify mergify bot added the conflicts label Dec 12, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of af9d6cb has failed:

On branch mergify/bp/release/2.1/pr-2297
Your branch is up to date with 'origin/release/2.1'.

You are currently cherry-picking commit af9d6cb29.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packages/std/src/math/signed_decimal_256.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packages/vm/src/modules/file_system_cache.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Dec 12, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@chipshort